More KML tweaks: Write average speed in trail header. Improve consistency of time...

diff --git a/kml.c b/kml.c
index f90e62264653c0d38ab0febf1ddd04e1c238fef7..5c3d125162e271cab15e183f485dd4fc48fcf682 100644 (file)
--- a/kml.c
+++ b/kml.c
@@ -470,6 +470,14 @@ void kml_output_trkdescription(const route_head *header, computed_trkdata *td)
                double spd = fmt_speed(td->max_spd, &spd_units);
                TD2("<b>Max Speed</b> %.1f %s", spd, spd_units);
        }
+       if (td->max_spd && td->start && td->end) {
+               char *spd_units;
+               time_t elapsed = td->end - td->start;
+               double spd = fmt_speed(td->distance_meters / elapsed, &spd_units);
+               if (spd > 1.0)  {
+                       TD2("<b>Avg Speed</b> %.1f %s", spd, spd_units);
+               }
+       }
        if (td->avg_hrt) {
                TD("<b>Avg Heart Rate</b> %.1f bpm", td->avg_hrt);
        }
@@ -489,9 +497,9 @@ void kml_output_trkdescription(const route_head *header, computed_trkdata *td)
                char time_string[64];
 
                xml_fill_in_time(time_string, td->start, 0, XML_LONG_TIME);
-               TD("<b>Start Time:</b> %s ", time_string);
+               TD("<b>Start Time</b> %s ", time_string);
                xml_fill_in_time(time_string, td->end, 0, XML_LONG_TIME);
-               TD("<b>End Time:</b> %s ", time_string);
+               TD("<b>End Time</b> %s ", time_string);
        }
 
        kml_write_xml(-1, "</table>]]>\n");

diff --git a/reference/earth-expertgps.kml b/reference/earth-expertgps.kml
index f0aa709f8298205a1d44d0397f4b9adeb18d881f..5756e1ce256946f626f2174cc81ac74d4594a523 100644 (file)
--- a/reference/earth-expertgps.kml
+++ b/reference/earth-expertgps.kml
@@ -790,8 +790,9 @@
             <tr><td><b>Min Alt</b> 3.281 ft </td></tr>
             <tr><td><b>Max Alt</b> 22.966 ft </td></tr>
             <tr><td><b>Max Speed</b> 25.5 mph </td></tr>
-            <tr><td><b>Start Time:</b> 2002-05-25T17:06:21Z  </td></tr>
-            <tr><td><b>End Time:</b> 2002-05-25T19:05:57Z  </td></tr>
+            <tr><td><b>Avg Speed</b> 2.4 mph </td></tr>
+            <tr><td><b>Start Time</b> 2002-05-25T17:06:21Z  </td></tr>
+            <tr><td><b>End Time</b> 2002-05-25T19:05:57Z  </td></tr>
           </table>]]>
         </description>
         <TimeSpan>